Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` #116396

obeis · 2023-10-03T20:09:45Z

tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr

compiler/rustc_hir_analysis/src/coherence/orphan.rs

bors · 2023-10-24T10:51:01Z

☔ The latest upstream changes (presumably #116435) made this pull request unmergeable. Please resolve the merge conflicts.

oli-obk · 2023-10-24T14:00:52Z

@bors r+ rollup

bors · 2023-10-24T14:00:54Z

📌 Commit 68f5536 has been approved by oli-obk

It is now in the queue for this repository.

…tics-7, r=oli-obk Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` r? `@compiler-errors`

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117029 (Add FileCheck annotations to MIR-opt inlining tests ) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116714 (Derive `Ord`, `PartialOrd` and `Hash` for `SocketAddr*`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116841 (Suggest unwrap/expect for let binding type mismatch) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117127 (Remove `#[allow(incomplete_features)]` from RPITIT/AFIT tests) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116396 - obeis:hir-analysis-migrate-diagnostics-7, r=oli-obk Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` r? ``@compiler-errors``

rustbot assigned compiler-errors Oct 3, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 3, 2023

compiler-errors reviewed Oct 12, 2023

View reviewed changes

tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr Outdated Show resolved Hide resolved

compiler-errors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 12, 2023

obeis force-pushed the hir-analysis-migrate-diagnostics-7 branch from 9de9ffd to e8dfb53 Compare October 12, 2023 17:31

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 12, 2023

obeis requested a review from compiler-errors October 12, 2023 18:06

cjgillot reviewed Oct 12, 2023

View reviewed changes

compiler/rustc_hir_analysis/src/coherence/orphan.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_analysis/src/coherence/orphan.rs Outdated Show resolved Hide resolved

obeis force-pushed the hir-analysis-migrate-diagnostics-7 branch from e8dfb53 to 0b5eef8 Compare October 12, 2023 18:37

obeis requested a review from cjgillot October 12, 2023 19:10

Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs

68f5536

obeis force-pushed the hir-analysis-migrate-diagnostics-7 branch from 0b5eef8 to 68f5536 Compare October 24, 2023 11:46

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 24, 2023

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 24, 2023

Rollup merge of rust-lang#116396 - obeis:hir-analysis-migrate-diagnos…

65297e0

…tics-7, r=oli-obk Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` r? `@compiler-errors`

matthiaskrgr mentioned this pull request Oct 24, 2023

Rollup of 6 pull requests #117125

Closed

matthiaskrgr mentioned this pull request Oct 24, 2023

Rollup of 8 pull requests #117135

Merged

bors merged commit f3e18e4 into rust-lang:master Oct 24, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 24, 2023

obeis deleted the hir-analysis-migrate-diagnostics-7 branch October 25, 2023 05:55

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` #116396

Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` #116396

obeis commented Oct 3, 2023

bors commented Oct 24, 2023

oli-obk commented Oct 24, 2023

bors commented Oct 24, 2023

Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs #116396

Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs #116396

Conversation

obeis commented Oct 3, 2023

bors commented Oct 24, 2023

oli-obk commented Oct 24, 2023

bors commented Oct 24, 2023

Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` #116396

Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` #116396